bitkeeper revision 1.1108.1.35 (4107c7da9kAXLjKhklba_j2Kjf05bg)

don't use common slab/page allocators for ia64 (it uses 2.6 stuff in arch directory)

diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
index 1d33ae40097fdf43d68f977abb30035ad9c1d693..aa55ed6b09a09a13b05acdddf17cdb47642a67f3 100644 (file)
--- a/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@ -54,3 +54,4 @@ xen/tools/figlet/figlet
 xen/xen
 xen/xen-syms
 xen/xen.*
+xen/common/sched_atropos.c.smh

diff --git a/xen/common/Makefile b/xen/common/Makefile
index 830418019883dc0236a1bd5d9856601f80e10bf9..84e3a1292f9251788fc29bf313de29e8e8c0df3d 100644 (file)
--- a/xen/common/Makefile
+++ b/xen/common/Makefile
@@ -1,6 +1,11 @@
 
 include $(BASEDIR)/Rules.mk
 
+ifeq ($(TARGET_ARCH),ia64) 
+OBJS := $(subst page_alloc.o,,$(OBJS))
+OBJS := $(subst slab.o,,$(OBJS))
+endif
+
 ifneq ($(debugger),y)
 OBJS := $(subst debug.o,,$(OBJS))
 OBJS := $(subst debug-linux.o,,$(OBJS))